Follow-up r69203: remove str_replace( '_', ' ', $query ); was only needed for Special...